Changeset 3062

Timestamp:

Sep 28, 2023, 3:32:59 PM (14 months ago)

Author:

jnaar

Message:

Spelling mistake "temp_dependant_m" corrected : now is "temp_dependent_m". Make sure you have the proper flag. JN

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/callkeys.h (modified) (2 diffs)
• libf/phymars/conf_phys.F (modified) (2 diffs)
• libf/phymars/nuclea.F (modified) (4 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4246 +4246 @@
 - Explicit comments in several sections of the code with these infos
 
+== 28/09/2023 == JN
+Following previous commit, correction of a spelling mistake "temp_dependant_m"
+is actually "temp_dependent_m". Sorry about that.

trunk/LMDZ.MARS/libf/phymars/callkeys.h

@@ -17 +17 @@
      &   ,CLFvarying,satindexco2,rdstorm,topflows,calllott_nonoro       &
      &   ,latentheat_surfwater,gwd_convective_source,startphy_file      &
-     &   ,hdo,hdofrac,cst_cap_albedo,temp_dependant_m,refill_watercap   &
+     &   ,hdo,hdofrac,cst_cap_albedo,temp_dependent_m,refill_watercap   &
      &   ,cloud_adapt_ts
 !$OMP THREADPRIVATE(/callkeys_l/)
@@ -75 +75 @@
       logical latentheat_surfwater ! latent heat release from ground water ice sublimation/condensation
       logical cst_cap_albedo ! polar cap albedo remains unchanged by water frost deposition
-      logical temp_dependant_m ! temperature-dependant water contact parameter
+      logical temp_dependent_m ! temperature-dependent water contact parameter
       logical refill_watercap ! h2o_ice_s is converted to watercap when above threshold
       logical cloud_adapt_ts ! adaptative timestep for cloud microphysics

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

@@ -746 +746 @@
         write(*,*) "water contact parameter ?"
         mteta  = 0.95 ! default value
-        temp_dependant_m  = .false. ! default value
-        call getin_p("temp_dependant_m",temp_dependant_m)
-        if (temp_dependant_m) then !(JN 2023)
-           print*,'You have chosen a temperature-dependant water'
+        temp_dependent_m  = .false. ! default value
+        call getin_p("temp_dependent_m",temp_dependent_m)
+        if (temp_dependent_m) then !(JN 2023)
+           print*,'You have chosen a temperature-dependent water'
            print*,'contact parameter ! From Maattanen et al. 2014'
-        else if (.not.temp_dependant_m) then
+        else if (.not.temp_dependent_m) then
            print*,'Water contact parameter is constant'
            call getin_p("mteta",mteta)
@@ -769 +769 @@
 ! global water cycle is nuts !)
         
-        if ((cloud_adapt_ts.and..not.temp_dependant_m).or.
-     &       (temp_dependant_m.and..not.cloud_adapt_ts)) then
+        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_dependant_m must be used together !'
+           print*,'temp_dependent_m must be used together !'
            print*,'Otherwise water cycle is off. At least one '
            print*,'of these flags is turned off. '

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

@@ -59 +59 @@
       mtetalocal = mteta  !! use mtetalocal for better performance
 
-      IF (temp_dependant_m) THEN
+      IF (temp_dependent_m) THEN
 c     J.Naar - sep 2023 :
 c     Simple linear parametrisation from Maattaanen 2014
@@ -67 +67 @@
 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_dependant_m) THEN
+      ENDIF ! (temp_dependent_m) THEN
 cccccccccccccccccccccccccccccccccccccccccccccccccc
 ccccccccccc ESSAIS TN MTETA = F (T) cccccccccccccc
@@ -83 +83 @@
 cccccccccccccccccccccccccccccccccccccccccccccccccc
 cccccccccccccccccccccccccccccccccccccccccccccccccc 
-      IF (firstcall.and.temp_dependant_m) THEN
+      IF (firstcall.and.temp_dependent_m) THEN
           print*, ' '  
           print*, 'dear user, please keep in mind that'
@@ -92 +92 @@
           print*, ' '  
          firstcall=.false.
-      ELSE IF (firstcall.and.(.not.(temp_dependant_m))) THEN
+      ELSE IF (firstcall.and.(.not.(temp_dependent_m))) THEN
           print*, ' '  
           print*, 'dear user, please keep in mind that'