Changeset 3064 for trunk

Timestamp:

Sep 30, 2023, 5:09:20 PM (14 months ago)

Author:

abierjon

Message:

Mars GCM:
Following r3061 and r3062 :

• adapt files callphys.def.GCM6 and callphys.def.MCD6 in deftank/ to match with the new orthograph of temp_dependent_m
• restore the possibility to run with a temperature-dependent contact parameter without using the cloud adaptative subtimestep (MCD6.1 configuration, mteta = linear fit of temp)

AB

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/callphys.def.GCM6 (modified) (1 diff)
• deftank/callphys.def.MCD6 (modified) (1 diff)
• libf/phymars/conf_phys.F (modified) (1 diff)
• libf/phymars/nuclea.F (modified) (3 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4218 +4218 @@
 Following previous commit, correction of a spelling mistake "temp_dependant_m"
 is actually "temp_dependent_m". Sorry about that.
+
+== 30/09/2023 == AB
+Following r3061 and r3062 :
+- adapt files callphys.def.GCM6 and callphys.def.MCD6 in deftank/ to match with the new orthograph of temp_dependent_m
+- restore the possibility to run with a temperature-dependent contact parameter without using the cloud adaptative subtimestep
+  (MCD6.1 configuration, mteta = linear fit of temp)

trunk/LMDZ.MARS/deftank/callphys.def.GCM6

@@ -171 +171 @@
 #        distribution of ice particles ?
 nuice_sed=0.1
-# WATER: contact parameter (only if temp_dependant_m = .false.)
+# WATER: contact parameter (only if temp_dependent_m = .false.)
 ##mteta = 0.95
-# Temperature-dependant water contact parameter
-temp_dependant_m = .true.
+# Temperature-dependent water contact parameter
+temp_dependent_m = .true.
 # WATER: current permanent caps at both poles. True IS RECOMMENDED
 #        (with .true., North cap is a source of water and South pole

trunk/LMDZ.MARS/deftank/callphys.def.MCD6

@@ -171 +171 @@
 #        distribution of ice particles ?
 nuice_sed=0.1
-# WATER: contact parameter (only if temp_dependant_m = .false.)
+# WATER: contact parameter (only if temp_dependent_m = .false.)
 ##mteta = 0.95
-# Temperature-dependant water contact parameter
-temp_dependant_m = .true.
+# Temperature-dependent water contact parameter
+temp_dependent_m = .true.
 # WATER: current permanent caps at both poles. True IS RECOMMENDED
 #        (with .true., North cap is a source of water and South pole

trunk/LMDZ.MARS/libf/phymars/conf_phys.F

@@ -768 +768 @@
 ! temperature dependent contact parameter (otherwise the 
 ! global water cycle is nuts !)
+! However one can use the temperature dependent contact parameter
+! without the adaptative timestep (MCD6.1 configuration)
         
-        if ((cloud_adapt_ts.and..not.temp_dependent_m).or.
-     &       (temp_dependent_m.and..not.cloud_adapt_ts)) then
-           print*,'Water cycle v6 : cloud_adapt_ts and '
-           print*,'temp_dependent_m must be used together !'
-           print*,'Otherwise water cycle is off. At least one '
-           print*,'of these flags is turned off. '
-           call abort_physic(modname,
-     &          "water cycle v6 needs cloud_adapt_ts and temp_dep_m",1)
+        if (cloud_adapt_ts.and..not.temp_dependent_m) then
+           print*,'Water cycle v6 : if cloud_adapt_ts is used'
+           print*,'then temp_dependent_m must be used!'
+           print*,'Otherwise the water cycle is unrealistic.'
+           call abort_physic(modname,
+     &          "cloud_adapt_ts requires temp_dependent_m",1)
         endif
 ! scavenging

trunk/LMDZ.MARS/libf/phymars/nuclea.F

@@ -61 +61 @@
       IF (temp_dependent_m) THEN
 c     J.Naar - sep 2023 :
-c     Simple linear parametrisation from Maattaanen 2014
-c     Maxed out at 0.97 for physical realism
-c     Used to tune the WC without adaptative ts of microphy
-c         mtetalocal = min(0.0044*temp + 0.1831,0.97)
-c     With adapt_ts need to use this relation (same paper, tanh):
-         mtetalocal = 0.469+((0.972-0.469)*tanh((temp/158.282)**4.244))
-      ENDIF ! (temp_dependent_m) THEN
+        if (.not.cloud_adapt_ts) then
+          ! Simple linear parametrisation from Maattaanen 2014
+          ! Maxed out at 0.97 for physical realism
+          ! Used to tune the WC without adaptative ts of microphy (MCD6.1 configuration)
+          mtetalocal = min(0.0044*temp + 0.1831,0.97)
+        else
+          ! With adapt_ts, need to use this relation (same paper, tanh relation):
+          mtetalocal = 0.469+((0.972-0.469)*tanh((temp/158.282)**4.244))
+        endif ! (.not.cloud_adapt_ts)
+      ENDIF ! (temp_dependent_m)
 cccccccccccccccccccccccccccccccccccccccccccccccccc
 ccccccccccc ESSAIS TN MTETA = F (T) cccccccccccccc
@@ -84 +87 @@
 cccccccccccccccccccccccccccccccccccccccccccccccccc 
       IF (firstcall.and.temp_dependent_m) THEN
+        if (.not.cloud_adapt_ts) then
+          print*, ' '  
+          print*, 'dear user, please keep in mind that'
+          print*, 'contact parameter IS NOT constant ;'
+          print*, 'Using the following linear fit from'
+          print*, 'Maattanen et al. 2014 (SM linear fit) :'
+          print*, 'm=min(0.0044*temp + 0.1831,0.97)'
+          print*, ' ' 
+        else !cloud_adapt_ts=.true.
           print*, ' '  
           print*, 'dear user, please keep in mind that'
@@ -90 +102 @@
           print*, 'Maattanen et al. 2014 (10.1016/j.grj.2014.09.002) :'
           print*, 'm=0.469+((0.972-0.469)*tanh((temp/158.282)**4.244))'
-          print*, ' '  
-         firstcall=.false.
+          print*, ' '
+        endif 
+        firstcall=.false.
       ELSE IF (firstcall.and.(.not.(temp_dependent_m))) THEN
-          print*, ' '  
-          print*, 'dear user, please keep in mind that'
-          print*, 'contact parameter IS constant'
-          print*, ' '  
-         firstcall=.false.
+        print*, ' '  
+        print*, 'dear user, please keep in mind that'
+        print*, 'contact parameter IS constant'
+        print*, ' '  
+        firstcall=.false.
       END IF
 cccccccccccccccccccccccccccccccccccccccccccccccccc