From 100b4f97c3ee08732d5db5d46738f5769e519913 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Mon, 19 Jul 2021 09:07:26 +0200
Subject: [PATCH] Quentin 19/07/2021: minor cosmetic change and modify
HCAMSFILETYPE default value to NETCDF (only possible value for now)
---
src/MNH/lima_init_ccn_activation_spectrum.f90 | 12 ++++++------
src/MNH/open_prc_files.f90 | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/MNH/lima_init_ccn_activation_spectrum.f90 b/src/MNH/lima_init_ccn_activation_spectrum.f90
index d5c513c56..16a561740 100644
--- a/src/MNH/lima_init_ccn_activation_spectrum.f90
+++ b/src/MNH/lima_init_ccn_activation_spectrum.f90
@@ -6,9 +6,9 @@
! ####################
MODULE MODI_LIMA_INIT_CCN_ACTIVATION_SPECTRUM
INTERFACE
- SUBROUTINE LIMA_INIT_CCN_ACTIVATION_SPECTRUM (CTYPE,XD,XSIGMA,XLIMIT_FACTOR,XK,XMU,XBETA,XKAPPA)
+ SUBROUTINE LIMA_INIT_CCN_ACTIVATION_SPECTRUM (CTYPE_CCN,XD,XSIGMA,XLIMIT_FACTOR,XK,XMU,XBETA,XKAPPA)
!
- CHARACTER(LEN=*), INTENT(IN) :: CTYPE ! Aerosol type
+ CHARACTER(LEN=*), INTENT(IN) :: CTYPE_CCN ! Aerosol type
REAL, INTENT(IN) :: XD ! Aerosol PSD modal diameter
REAL, INTENT(IN) :: XSIGMA ! Aerosol PSD width
REAL, INTENT(OUT) :: XLIMIT_FACTOR ! C/Naer
@@ -23,7 +23,7 @@ END MODULE MODI_LIMA_INIT_CCN_ACTIVATION_SPECTRUM
! ####################
!
! #############################################################
- SUBROUTINE LIMA_INIT_CCN_ACTIVATION_SPECTRUM (CTYPE,XD,XSIGMA,XLIMIT_FACTOR,XK,XMU,XBETA,XKAPPA)
+ SUBROUTINE LIMA_INIT_CCN_ACTIVATION_SPECTRUM (CTYPE_CCN,XD,XSIGMA,XLIMIT_FACTOR,XK,XMU,XBETA,XKAPPA)
! #############################################################
!!
@@ -60,7 +60,7 @@ IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
!
-CHARACTER(LEN=*), INTENT(IN) :: CTYPE ! Aerosol type
+CHARACTER(LEN=*), INTENT(IN) :: CTYPE_CCN ! Aerosol type
REAL, INTENT(IN) :: XD ! Aerosol PSD modal diameter
REAL, INTENT(IN) :: XSIGMA ! Aerosol PSD width
REAL, INTENT(OUT) :: XLIMIT_FACTOR ! C/Naer
@@ -97,12 +97,12 @@ REAL, DIMENSION(1) :: XT ! temperature
!
!-------------------------------------------------------------------------------
!
-!* 1. Select kappa value based on CTYPE
+!* 1. Select kappa value based on CTYPE_CCN
! ---------------------------------
!
! Kappa values are from Petters and Kreidenweis (2007), table 1.
!
-SELECT CASE (CTYPE)
+SELECT CASE (CTYPE_CCN)
CASE('NH42SO4','C') ! Ammonium sulfate
XKAPPA = 0.61
CASE('NH4NO3') ! Ammonium nitrate
diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90
index 52124869b..ecf98378f 100644
--- a/src/MNH/open_prc_files.f90
+++ b/src/MNH/open_prc_files.f90
@@ -173,7 +173,7 @@ HCHEMFILETYPE='MESONH'
HSURFFILE=' '
HSURFFILETYPE='MESONH'
HCAMSFILE=' '
-HCAMSFILETYPE='MESONH'
+HCAMSFILETYPE='NETCDF'
!
!-------------------------------------------------------------------------------
!
--
GitLab